Merge
authorAlastair Tse <atse@xensource.com>
Thu, 7 Dec 2006 11:44:05 +0000 (11:44 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 7 Dec 2006 11:44:05 +0000 (11:44 +0000)

Trivial merge